Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 25 Jul 2010 10:16:08 +0000 (10:16 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 25 Jul 2010 10:16:08 +0000 (10:16 +0000)
commite758aea68227273b8dd6d8d294ea29279aa8dc87
tree2f0d2c62d367f9fd7a9a361d84d527ee9e355d98
parentd7f719d9896271f919c38b8a362b6f1678553616
parent7058d6708f37a96ba66e2174fd65a0c4bc7bca7f
Merge from mainline.